From 4c76dd8f5f9612f95a1e1db219c40355b5345a8d Mon Sep 17 00:00:00 2001
From: Nipunn Koorapati <nipunn1313@gmail.com>
Date: Sun, 6 Nov 2016 23:33:49 +1100
Subject: [PATCH] Replace instances of src[..]*.rs with [/]

---
 tests/cargotest/support/mod.rs |  3 ++-
 tests/clean.rs                 |  2 +-
 tests/doc.rs                   |  2 +-
 tests/metadata.rs              | 20 ++++++++++----------
 tests/package.rs               |  2 +-
 tests/read-manifest.rs         |  2 +-
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/tests/cargotest/support/mod.rs b/tests/cargotest/support/mod.rs
index cef108bcc..ea6326189 100644
--- a/tests/cargotest/support/mod.rs
+++ b/tests/cargotest/support/mod.rs
@@ -351,7 +351,7 @@ impl Execs {
                  description: &str, extra: &[u8],
                  partial: bool) -> ham::MatchResult {
         let out = match expected {
-            Some(out) => substitute_macros(out),
+            Some(out) => out,
             None => return ham::success(),
         };
         let actual = match str::from_utf8(actual) {
@@ -432,6 +432,7 @@ impl Execs {
 }
 
 pub fn lines_match(expected: &str, mut actual: &str) -> bool {
+    let expected = substitute_macros(expected);
     for (i, part) in expected.split("[..]").enumerate() {
         match actual.find(part) {
             Some(j) => {
diff --git a/tests/clean.rs b/tests/clean.rs
index c10b58b05..59170ed70 100644
--- a/tests/clean.rs
+++ b/tests/clean.rs
@@ -173,7 +173,7 @@ fn build_script() {
 [COMPILING] foo v0.0.1 ([..])
 [RUNNING] `rustc build.rs [..]`
 [RUNNING] `[..]build-script-build`
-[RUNNING] `rustc src[..]main.rs [..]`
+[RUNNING] `rustc src[/]main.rs [..]`
 [FINISHED] debug [unoptimized + debuginfo] target(s) in [..]
 "));
 }
diff --git a/tests/doc.rs b/tests/doc.rs
index ba5ea85ac..457e53c25 100644
--- a/tests/doc.rs
+++ b/tests/doc.rs
@@ -445,7 +445,7 @@ fn doc_release() {
                 execs().with_status(0)
                        .with_stderr("\
 [DOCUMENTING] foo v0.0.1 ([..])
-[RUNNING] `rustdoc src[..]lib.rs [..]`
+[RUNNING] `rustdoc src[/]lib.rs [..]`
 "));
 }
 
diff --git a/tests/metadata.rs b/tests/metadata.rs
index 2ed82b294..846647123 100644
--- a/tests/metadata.rs
+++ b/tests/metadata.rs
@@ -27,7 +27,7 @@ fn cargo_metadata_simple() {
                             "bin"
                         ],
                         "name": "foo",
-                        "src_path": "src[..]foo.rs"
+                        "src_path": "src[/]foo.rs"
                     }
                 ],
                 "features": {},
@@ -212,11 +212,11 @@ fn workspace_metadata() {
                     {
                         "kind": [ "lib" ],
                         "name": "bar",
-                        "src_path": "[..]bar[..]src[..]lib.rs"
+                        "src_path": "[..]bar[/]src[/]lib.rs"
                     }
                 ],
                 "features": {},
-                "manifest_path": "[..]bar[..]Cargo.toml"
+                "manifest_path": "[..]bar[/]Cargo.toml"
             },
             {
                 "name": "baz",
@@ -230,11 +230,11 @@ fn workspace_metadata() {
                     {
                         "kind": [ "lib" ],
                         "name": "baz",
-                        "src_path": "[..]baz[..]src[..]lib.rs"
+                        "src_path": "[..]baz[/]src[/]lib.rs"
                     }
                 ],
                 "features": {},
-                "manifest_path": "[..]baz[..]Cargo.toml"
+                "manifest_path": "[..]baz[/]Cargo.toml"
             }
         ],
         "workspace_members": ["baz 0.5.0 (path+file:[..]baz)", "bar 0.5.0 (path+file:[..]bar)"],
@@ -283,11 +283,11 @@ fn workspace_metadata_no_deps() {
                     {
                         "kind": [ "lib" ],
                         "name": "bar",
-                        "src_path": "[..]bar[..]src[..]lib.rs"
+                        "src_path": "[..]bar[/]src[/]lib.rs"
                     }
                 ],
                 "features": {},
-                "manifest_path": "[..]bar[..]Cargo.toml"
+                "manifest_path": "[..]bar[/]Cargo.toml"
             },
             {
                 "name": "baz",
@@ -301,11 +301,11 @@ fn workspace_metadata_no_deps() {
                     {
                         "kind": [ "lib" ],
                         "name": "baz",
-                        "src_path": "[..]baz[..]src[..]lib.rs"
+                        "src_path": "[..]baz[/]src[/]lib.rs"
                     }
                 ],
                 "features": {},
-                "manifest_path": "[..]baz[..]Cargo.toml"
+                "manifest_path": "[..]baz[/]Cargo.toml"
             }
         ],
         "workspace_members": ["baz 0.5.0 (path+file:[..]baz)", "bar 0.5.0 (path+file:[..]bar)"],
@@ -341,7 +341,7 @@ const MANIFEST_OUTPUT: &'static str=
         "targets":[{
             "kind":["bin"],
             "name":"foo",
-            "src_path":"src[..]foo.rs"
+            "src_path":"src[/]foo.rs"
         }],
         "features":{},
         "manifest_path":"[..]Cargo.toml"
diff --git a/tests/package.rs b/tests/package.rs
index 7f3712f37..f7b3d870c 100644
--- a/tests/package.rs
+++ b/tests/package.rs
@@ -48,7 +48,7 @@ See [..]
     assert_that(p.cargo("package").arg("-l"),
                 execs().with_status(0).with_stdout("\
 Cargo.toml
-src[..]main.rs
+src[/]main.rs
 "));
     assert_that(p.cargo("package"),
                 execs().with_status(0).with_stdout(""));
diff --git a/tests/read-manifest.rs b/tests/read-manifest.rs
index 44f7fa6f9..e13f8ba80 100644
--- a/tests/read-manifest.rs
+++ b/tests/read-manifest.rs
@@ -21,7 +21,7 @@ fn read_manifest_output() -> String {
     "targets":[{
         "kind":["bin"],
         "name":"foo",
-        "src_path":"src[..]foo.rs"
+        "src_path":"src[/]foo.rs"
     }],
     "features":{},
     "manifest_path":"[..]Cargo.toml"
-- 
2.30.2